Move private GdkX11 symbols out of a public header

This avoids private symbols showing up in the introspection data, as
well as in the undocumented symbols list when generating the GDK API
reference.

diff --git a/gdk/x11/gdkdevice-xi2-private.h b/gdk/x11/gdkdevice-xi2-private.h
index 1ca4dc033d1a29d386aafe1552baf11d3484dbc1..b99a6735d5a2fae4c9c9f9ce1ccd5513b9a58c5e 100644 (file)
--- a/gdk/x11/gdkdevice-xi2-private.h
+++ b/gdk/x11/gdkdevice-xi2-private.h
@@ -1,9 +1,40 @@
+/* gdkdevice-xi2-private.h: Private header for GdkX11DeviceXI2
+ *
+ * Copyright 2020  Red Hat
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __GDK_DEVICE_XI2_PRIVATE_H__
 #define __GDK_DEVICE_XI2_PRIVATE_H__
 
+#include "gdkx11device-xi2.h"
+
+G_BEGIN_DECLS
+
 void gdk_x11_device_xi2_query_state (GdkDevice        *device,
                                      GdkSurface       *surface,
                                      double           *win_x,
                                      double           *win_y,
                                      GdkModifierType  *mask);
+
+GdkX11DeviceType gdk_x11_device_xi2_get_device_type (GdkX11DeviceXI2 *device);
+void             gdk_x11_device_xi2_set_device_type (GdkX11DeviceXI2  *device,
+                                                     GdkX11DeviceType  type);
+
+G_END_DECLS
+
 #endif

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 3f5b855cf4eb2eb85c916a13812031f29f16e6b4..8e6c05d15cfe07f7d34a765ada658119d1e63fe6 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -18,8 +18,8 @@
 #include "config.h"
 
 #include "gdkx11devicemanager-xi2.h"
-#include "gdkx11device-xi2.h"
 
+#include "gdkdevice-xi2-private.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetoolprivate.h"
 #include "gdkdisplayprivate.h"

diff --git a/gdk/x11/gdkx11device-xi2.h b/gdk/x11/gdkx11device-xi2.h
index 169e71f25413829f1f7817415f5c52ace9efe5ac..bc06e71952ad59a8863da4322cef2151f827c66b 100644 (file)
--- a/gdk/x11/gdkx11device-xi2.h
+++ b/gdk/x11/gdkx11device-xi2.h
@@ -41,10 +41,6 @@ typedef enum {
 GDK_AVAILABLE_IN_ALL
 GType gdk_x11_device_xi2_get_type (void) G_GNUC_CONST;
 
-GdkX11DeviceType gdk_x11_device_xi2_get_device_type (GdkX11DeviceXI2 *device);
-void             gdk_x11_device_xi2_set_device_type (GdkX11DeviceXI2  *device,
-                                                     GdkX11DeviceType  type);
-
 G_END_DECLS
 
 #endif /* __GDK_X11_DEVICE_XI2_H__ */